Skip to content

Conversation

BillFarber
Copy link
Contributor

@BillFarber BillFarber commented Oct 3, 2025

NOTE - This PR is an either/or with PR #226. I'll wait to see comments to decide which one to use.

Upgrades Java to version 17 and Spring to version 6.

This change upgrades the Java source and target compatibility to version 17, and enforces Spring 6 dependencies to address potential CVEs.

@BillFarber BillFarber requested a review from rjrudin as a code owner October 3, 2025 14:47
@Copilot Copilot AI review requested due to automatic review settings October 3, 2025 14:47
Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review any files in this pull request.


Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

Copy link

github-actions bot commented Oct 3, 2025

Copyright Validation Results
Total: 1 | Passed: 0 | Failed: 0 | Skipped: 1 | at: 2025-10-03 14:51:13 UTC | commit: 84980a7

⏭️ Skipped (Excluded) Files

  • build.gradle

✅ All files have valid copyright headers!

@BillFarber BillFarber changed the title MLE-24529 - Upgrades Java and Spring versions MLE-24529 - Upgrades Java and Spring versions (based on Copilot's suggestion) Oct 3, 2025
Copy link
Contributor

@rjrudin rjrudin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah don't do this one.

if (details.requested.group == 'org.apache.commons' && details.requested.name == 'commons-lang3') {
details.useVersion '3.18.0'
}
if (details.requested.group == 'org.springframework') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem with this is the reader has no idea what's bringing in Spring. We only have one problem - which is that marklogic-junit5 is bring in Spring 5. So it's better to make that problem explicit by modifying the marklogic-junit5 dependency until it's been bumped up to use Spring 6.

// (https://www.cve.org/CVERecord?id=CVE-2025-48924), without also
// upgrading ml-app-deployer to 6.0.0, which we are not ready to do yet.
force 'org.apache.commons:commons-lang3:3.18.0'
eachDependency { DependencyResolveDetails details ->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can hopefully get rid of these once you've upgraded to Kafka 4. Per the comment on the commons-lang3 one - that was due to an older version of ml-app-deployer, so it's likely that that "force" can be removed. Note as well, we never want to have these "useVersion" blocks in here without a corresponding details.because to document why we're forcing a version.

@BillFarber BillFarber closed this Oct 6, 2025
@BillFarber BillFarber deleted the Spring6FromCopilot branch October 7, 2025 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants